Make print dialog work when 'BrowseShortNames Off' is specified in cups

2006-11-25  Matthias Clasen  <mclasen@redhat.com>

        * modules/printbackends/cups/gtkprintbackendcups.c: Make
        print dialog work when 'BrowseShortNames Off' is specified
        in cups configuration. Patch by Tim Waugh.

diff --git a/ChangeLog b/ChangeLog
index 946bdf7a1d0675dde2cbdfee1263707cc2a42519..e18f9e8910d0bb046c8236087d9155e33cde0b2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * modules/printbackends/cups/gtkprintbackendcups.c: Make
+       print dialog work when 'BrowseShortNames Off' is specified
+       in cups configuration. Patch by Tim Waugh.
+
 2006-11-24  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_move_cursor_up_down): if we

diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index e40c8a75ec7b824d410dfe97c7e58797ede53532..12288710d2dd02c89f3a6f42ac943ce7755e4f51 100644 (file)
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -1077,11 +1077,11 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
                        resource);
 #endif
 
-          if (member_uris && !strncmp (resource, "/printers/", 10))
+          if (!strncmp (resource, "/printers/", 10))
            {
              cups_printer->ppd_name = g_strdup (resource + 10);
               GTK_NOTE (PRINTING,
-                        g_print ("CUPS Backend: Setting ppd name '%s' for printer class '%s'\n", cups_printer->ppd_name, printer_name));
+                        g_print ("CUPS Backend: Setting ppd name '%s' for printer/class '%s'\n", cups_printer->ppd_name, printer_name));
             }
 
          gethostname (uri, sizeof(uri));